Merge git://git.denx.de/u-boot-samsung
authorTom Rini <[email protected]>
Fri, 10 Jul 2015 13:40:59 +0000 (09:40 -0400)
committerTom Rini <[email protected]>
Fri, 10 Jul 2015 13:40:59 +0000 (09:40 -0400)

Trivial merge